debugging extras

And goodies!