Fixed some bugs, and got some new results