A bunch of more changes