adding new cases, plus a few typos