fix date in posts, template updates
merging