Lots of improvements all over the place