Fixed a couple bugs.
Merge branch 'dev' of github.com:legworkstudio/Legwork2012 into dev