Cleanup, add debug output
2.1.0