Armchair mapping; mostly maintenance and tagfixes. Due to the various ways that tags can be misspelled, i will rarely comment my edits to speed up the QA process.