Fixed maaany things. Added/removed/moved around existing stuff, some of it quite subtle but very significant.