Doc update and merges