Reindented, fixed some missing/invalid tags