Fixing some minor bugs...
Merge branch 'work_branch'