Fixed some bugs but the corrections have not been tested
Merge branch 'master' of https://github.com/Ragnarok719/SpicyCoders