further updates/refactoring of OwlClient
Merge branch 'owl-client'