minor changes as Rabbit work progresses.