bug fix
few detail adjust