builtins: fixes
cpp: first draft of builtins file. Haven't tried to compile