fixed bugs, removed some print statements, expanded table