Fixed some bugs, not all.