fix lots of bugs
fix lots of bugs
fix lots of bugs
Merge branch 'adjust_fix_bugs' into dev