Some Stuff fixed