Some cleanup and documentation updates.
More cleanup of single task
More tests, tweaks.