fix some code some InterFace