bugfixes setup/various