Add debug code.
Remove trush.
Update for yossy.