Fixed as much as i could