Minor changes and updated TODO list
Changed to using a high resolution clock (to see if it avoids the GCC bug)