Fixed the grammar for function param matching.
Using in function for maps instead of boolean test.
Cleanup
Fixed the grammar so that recursion works now (misnamed some things for function calls)