bugfixes and interface changes