comment control added and bug fix