fixing builtins
fix builtins to not literalize so much