Typos, and some re-formulating