Merge pull request #1 from jasongrout/ben

Fix 3 typos
Updating files from fall 2012