ENH: Better debugging

Addresses #93