fix markup and date