Lots of improvements!