Fix a lot of style issues, plus incorrect tags