Minor bugfixes and new features.