fixed bugs, changed dataset