Lots of improvements all over