lots of fixes and builtins added