Fixed some known bugs, and added some new bugs.