I fixed this and the line spacing mentioned above but I imagine there will be some changes related to reducing markup so I'm going to commit that all at once.