Fixes and cleanup - Calendar still needs work