More updates and cleanup to docs