Fixed up markup, fixed some pub rules issues