Small fixes
Made a lot of fixes
more fixes
Adding alert
Merge pull request #37 from datboitom/bugs

Bugs