bugfixes complete