Options Working

Sorry, had a merge conflict. Should be all right now.
Smaller Edits

just some edits to the Options (after fixing the merge conflict)