fix calendar stuff