Fixed more things I think