Added in a calendar thing and a little conf change