Clean up of command line options and implementation of distance dumping features