Change and fix a lot of stuff