Bugfixes

oops: Fixed function evaluation
add: Partial function evaluation