Remove utterly irrelevant comments
Remove outdated comment
Refactor Options class with more options set, some compile errors
Options handler, syntax fixed so that it compiles with typedef for ptr-to-method works