Update docs and comments slightly in Api