Bug fixes, refactoring
Add Options verb support
Small corrections