return: small improvements