Updated readme, options names, and tests.