a fix and a bunch of debugging changes
5 files changed