start to move option handling into single location
front-load more option-checking
separate out option checking from implementation
fix typo
move non-option activity closer together