fixed couple bugs within calendar