Added some minor bug fixes
Merge branch 'master' of github.com:aaslun/Scissors-Continued-Yet-Again