small fixes, calendar work