Fixed More Stuff