a few nitpicks