more issues fixed