all.sample: reorg all.sample and add needed vars