minor fixes based on reviewer feedback