fixing late-night typos, all tested now