CLI: selector > type
Minor logic refactoring.
Update readme to reflect changes to API.
Update tests.