few new bugfixes