fixed some more