More changes, really really needs tuning
Changed a few things