WIP commit. Cleaning up a couple bugs/typos, correcting versions of a
couple deps.