Fixing everything you guys broke while I was gone...