A bunch of improvements