Misc. improvements and bug fixes
Merge branch 'work'

* work:
  Misc. improvements and bug fixes