fixes for the new comment/pm markup