builtins: moved to cpp file + fixes
q2,q4: work