v1.0.4 - debug mode and clean up