updates to Calendar functionality to compile with Mac