Added support for user function syntax (no funcs yet)
Improved function syntax