more bug fixes
nearly finished calendar