improve on organization and fix typos, etc