Changed stuff

Removed some stuff and adjusted the values of other stuff