smaller adjustments and bugfixes