Fixes -- back to where project started a few weeks ago, before big
refactor.