Fix nits, move dates into calendar