cleaner setup and teardown
Debugging info for #36