diff --git a/build_tool/main.cpp b/build_tool/main.cpp
index fb0e905..9201a13 100644
--- a/build_tool/main.cpp
+++ b/build_tool/main.cpp
@@ -42,22 +42,21 @@ int main(int argument_count, char **arguments) {
             result = Run(cc + build_file + flags);
         } else if (cc == "clang") {
             Array<S8_String> flags = {Perm};
+            cc                     = "clang++";
+
             flags += "-std=c++11 -g";
             flags += "-fdiagnostics-absolute-paths";
             flags += "-Wno-writable-strings";
-            flags += "-fno-exceptions";
-            flags += "-fno-rtti";
             flags += "-lm";
             flags += Fmt("-o %.*s", S8_Expand(exe_name));
             result = Run(cc + build_file + flags);
         } else {
             IO_Assert(cc == "gcc");
+            cc = "g++";
 
             Array<S8_String> flags = {Perm};
             flags += "-std=c++11 -g";
             flags += "-Wno-write-strings";
-            flags += "-fno-exceptions";
-            flags += "-fno-rtti";
             flags += "-lm";
             flags += Fmt("-o %.*s", S8_Expand(exe_name));
             result = Run(cc + build_file + flags);
diff --git a/core/core.c b/core/core.c
index b450787..723e36d 100644
--- a/core/core.c
+++ b/core/core.c
@@ -20,11 +20,3 @@
 #include "filesystem.c"
 
 #include "cmd.c"
-
-/*
-- I think it's okay to say that strings being null terminated should be mostly treated as NOT terminated but leave some
-   leeway for big buffers and other such things. Just make sure to not relay on it because it's easier unless specified.
-- Not sure if we should assume that strings should use allocators or arenas, for now it's arenas because I don't have other use cases
-@todo
-- Remove static buffers from filesystem, use scratch arenas, more secure, data corruption instead of control flow corruption
-*/