More Stuff Fixed