Added built-in functions
Some small fixes