fix bug on registration
few updates