Some more debug flags...
Merge pull request #33 from agueganno/minor-improvements

Some more debug flags...