fixed it some more