Added key to calendar.  Added estimate refreshing.  Fixed bugs