QOL changes

Final edits made, commented out extraneous stuff.