different bugfixes