several bugfixes, elimination of bogus error messages