Submitting all edits back to World of Tomorrow

This is a PR of all edits i've made since i started maintaining NoItem. It's a bit messy, but brings the master current.