Cleanup, refinements, and a horrible, horrible idea.