Commit working debug example
Some cleanups and fixes