A series of improvements