small changes re: first review with @jmcphers