fix: fix typos and improve flow

This addresses some of the easier changes from #2.