Various minor fixups
Updated plumbing
Added SEE ALSO
Rewrote dispatching for recursion