A bunch more changes