Add more debug output
Commentification