Exit 1 on failure
Better error message
Start on short format
Drop some unused variables
Start on "name mode"