added calendar, images, tweaks