All fixed, little more tidy up and done