A diff fixing a ton of errors made by Andy King. The Diff follow

Benjamin Mako Hill || Want to submit a patch?