Updates from comments in PR and other minor doc changes etc.