lots of improvements