Work on options and settings.

More fixes to the options menu.
Added more functionality to the settings class.
Fixed some comments.