builtin 'return'

and bug fixes