Fix/hell of a lot