small text edit in then return

mostly disambiguation work, also typo fixed in a comment