Commiting Calendar and some improvements