Some Stuff fixed and done