Fixed some more, This should work better