lasts bugfixes before release v3.1