cleaned up menu some more, major changes to getting calendar working