fixed some more, 9 to go