continuing bugfixes