fix some bugs, still having trouble with partioning