Commit nine. Fixing a few errors.