revamp call to contact a bit
Spiff up command-line and index