typos and merge-mess fixed