prettify, robustify

also, debuggery hackify