more issues; fix some typos; add missing param