added TODO
Removed some debug diagnostics. 2 remaining..