Code Clean up and tweaked the DB
Merge branch 'master' of https://github.com/MrDoor/Fartblasters