update undelegate
udpate comment
bug fix