Sexy calendar working - tweaks