few fixes/improvements in calendar