Fixed All The Stuffs