Fixed some of the bugs, the ones I could recreate anyway.