Misc edits

Too many to count and list :/