Fix return value as seen by @jburel
Minor cleanup
Reduce verbose System.err as seen by @zeb