Mix of bugfixes and new functionality