put in EOT handling; merge dump and rdump;