small fixes to sending sample number