Edited TODO section
Added debugging texts