more typos, markers for changes to make later