bugfixes, minor