Commit ''without'' (knocking wood) debug comments.
Ready for merge.