Cleanup in contact_manager, slight doc improvements, manifest cleanup