refactored options and tests, expanded readme