more fixes to handle epected data format