added TODO
added TODO
debugging & usability improvements