Fixed some bad markup, other minor fixes