add bad-whitespace plugin
move MatchTag to the HTML section
fix whitespace