re-arrange and fix most obvious typos