Add calendar link, clean up dashes