Fixed a few errors that I left in during the merge.