Made some minor changes, Tried to made some major changes, but made minor bug fixes. :)