fixed yet more issues