Clean up some debuggery stuff
Clean up some TODOs