fix typos, cleanup structure, and add some sugar