Doc update and fix