Robustifying + harmonization of output.  closes #1