Doc updates
Clean up attach
Rebase