Lots of improvements and new features