improved calendar support