calendar+fixes