add and update some DEBUG messages
add important ToDO
not sure if necessary..