addressing nitpicks