Completed small changes

It works! WIthout database stuffs though. :(
Merge branch 'master' of https://github.com/ChemicalWonders/ClaremontHacks