small changes - see commits