Fixed a few bugs and all that

Pls refer to the Readme.html :3