update structure and typos