Made a bunch more changes