fixed samples, more cleanup