Fixed up some bugs in binary table and graph