less room for error
That sort of removes the last horrible code. Surely can still be improved, but mostly oo now
rather large commit, but essentially a simple rename Rationale in docs and blogs
