fixed some more issues