bugfixes, continued on raports