bug fixes
Merge pull request #274 from ThePyrotechnic/Dev

bug fixes