update with some more builtins