added some comments
added consitency in user experience for click