Go through fix oversights, typos, and bugs. Now runs.