expanded almost every section, plus typo corrections