adjustments and bugfixes