Fixed it some more