minor bugfixes, and new features.