some more attempted bugfixes