bugfixes + interface changes