added disconnect and comments