Some work on the help patch, but this all seems kind of half-baked, and will probably make for a small sprint of its own