some more issues fixed