more consistent option handling
goddamned whitespace