Typos and fixups