Add texting and clean up style
More helper functions
Merge branch 'master' of https://github.com/dmrd/oz
Cleanup and plugin fixes