Fixed bugs in the first commit with data stuff