Bugs Fixed... I hope

I think I fixed the bugs that you caught, as well as 1-2 more. More details are in the email I sent you!