Fix return value as seen by J-M
Minor cleanup
Reduce verbose System.err as seen by @zeb