updated todo and added documentation for debug and the like