diff --git a/TODO b/TODO
index 02a7d5ca..0e4b84ed 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,23 @@
 
 
-* Add L1 cache + banked scratchpad
-* csri bug?
+
+Functionality:
+1) vx_cl_warpSpawn()
+   -> To be used by pocl->ops->run
+
+2) newlib Integration (LoadFile(""))
+   -> To be used by the Rhinio benchmarks
+
+3) POCL OPS Vortex Suite
+
+Performance:
+1) Icache doesn't need SEND_MEM_REQUEST Stage
+   -> Blocks are never dirty, so why not evict right away 
+
+2) Branch not taken speculation
+
+3) Runtime -02 not running on RTL, and -03 not running on RTL and Emulator
+
+
+Vector:
+1) Cycle accurate simulator (would require Cache Simulator)
diff --git a/emulator/core.cpp b/emulator/core.cpp
index 51daf5c6..53bbfc10 100644
--- a/emulator/core.cpp
+++ b/emulator/core.cpp
@@ -257,13 +257,13 @@ bool Warp::interrupt(Word r0) {
 }
 
 void Warp::printStats() const {
-  cout << "Steps : " << steps << endl
+  cerr << "Steps : " << steps << endl
        << "Insts : " << insts << endl
        << "Loads : " << loads << endl
        << "Stores: " << stores << endl;
 
   unsigned const grade = reg[0][28];
 
-  if (grade == 1) cout << "GRADE: PASSED\n";
-  else              cout << "GRADE: FAILED "  << (grade >> 1) << "\n";
+  if (grade == 1) cerr << "GRADE: PASSED\n";
+  else              cerr << "GRADE: FAILED "  << (grade >> 1) << "\n";
 }
diff --git a/emulator/core.o b/emulator/core.o
index 62ec4f3c..c7760ea5 100644
Binary files a/emulator/core.o and b/emulator/core.o differ
diff --git a/emulator/harptool b/emulator/harptool
index f7c8adb7..96b5ae5a 100755
Binary files a/emulator/harptool and b/emulator/harptool differ
diff --git a/emulator/libharplib.a b/emulator/libharplib.a
index 48a62921..610cf892 100644
Binary files a/emulator/libharplib.a and b/emulator/libharplib.a differ
diff --git a/emulator/libharplib.so b/emulator/libharplib.so
index f0bcc017..e9b9253d 100755
Binary files a/emulator/libharplib.so and b/emulator/libharplib.so differ
diff --git a/emulator/test_riscv.sh b/emulator/test_riscv.sh
index 3554b5b2..656aeeac 100755
--- a/emulator/test_riscv.sh
+++ b/emulator/test_riscv.sh
@@ -1,4 +1,4 @@
 echo start > results.txt
 
 echo ../kernel/vortex_test.hex
-./harptool -E -a rv32i --core ../runtime/mains/simple/vx_simple_main.hex  -s -b 1> emulator.debug
+./harptool -E -a rv32i --core ../runtime/mains/dev/vx_dev_main.hex  -s -b 1> emulator.debug