bugs
Merge branch 'final_fixes'