added some useful debugging stuff
updated todo