fixes to comments from @ldodds