Removed unneccesary stuff, changed settings