fixed some more...