bugfixes to master