Some other big edits (cleaned up a few things)