fixes to sample_wtatage. Still not complete