more bug fixes!
Merge branch 'master' of github.com:ajauhri/712_project