a few adjustments and bugfixes