pending bugfixes