Fixed all errors regarding data