more fixes and data validation passed