More corrections, making progress :)
Merge branch 'master' of github.com:frmi/sw605f14-latex