Fixed bugs and organized a bit

TODO: still need the second dataset