v.0.86 - More verbose error report, some cleanups.