re-org and typos