Some documentation updates, calling  when