adjustments, small bugfixes