ENH fix typos, use named tuples