Some Stuff Fixed