severals typos & adjustments