Updated with Russell's "daemon" change and other fixes.

How does this look?

Dan