Modified a LOT of things

Some things are still broken, I am working on them -_-
Merge pull request #1 from CameronRedmore/master

Modified a LOT of things