Fixed some errors and cleaned up much!
Merge pull request #1 from ellisgeek/master

Fixed some errors and cleaned up much!