Fixed Some Stuff and things