Doc changes, plus keep track of entry wall.