fixes after feedback from @mikes-c