more fixes in data massaging part