Bugfixes, various new features.