updates to sample and some clean-up