bug fixes and performance improvements

calendar_today20-01-2010 10:21:45