bunch of builtins improvements