Fixed Some Stuff