Fixed some bugs
Merge pull request #19 from grimSkepsis/Mike's-Branch

Fixed some bugs