I think I have fixed the horror. Still learning git...