calendar + minor fixes