some changes

just small adjustments and fixes, which were discussed with Brian and
Tim