fix typos, re-arrange, fiddle w/ hierarchy