few final bugfixes