- suppressed debug output
- added some todos
- sligthly better displaying for comments