fixed some more, 7 to go