some fixes
KidoZen