fixed typos, coordinated list with lasagna
fixed trivial merge conflict