Cleanup
- add debug log
- fix missing module WD