Fixed some bugs, still need to update protein table