fix calendar choice
minor changes