... and bugfixes