Improves builtins, fixes function errors