fixes everywhere.. 1left to go