various updates
Merge branch 'master' of github.com:xinix-technology/bono