A bunch of changes

Only take what you want :)