final(?) commit on IAv2 branch; manual typos