and again bugfixes