* bugfixes and new functionality