fixed some more issues …