(nit) more complete error messaging, better output formatting