Some bugfixes, at least one still remains....