Bug Fixes 1

I'm terribly sorry about the bugs in the last update. I've fixed them as far as I can tell.

Thanks again :)