Most changes made by Doug for better provessing (Yeah, that's a dumb statement, but I'm not sure what all the changes were made for)