fixes suggested by Chris after a read-through