Clean up, and copy missing content from current manual.