Ok now its all fixed up (I hope)