Lots of improvements for upcoming release.