integrate fixes from Oliver. THX