Most bugs fixed
Merge pull request #38 from datboitom/weird-bug

Most bugs fixed