Change a couple of return annotations
update doc