things pointed out by review from @robacarp