Reorganize sections; fix typos