Fix for compile error
Removed dataCheck()
Added extensive data check and fixer.