small touches and fixes for RecordData & Shot Detection