Fixing tags, and whitespace changes