add debugging/cleanups