Typos and small edits (bis)