many bug fixes
Merge branch 'bug_fixin'

* bug_fixin:
  many bug fixes