still plodding on

another couple of changes