second commit minus typos