fixed parsing of function-values
allow resolve to be passed as a fuction reference (syntax check)
typo