Added some events and better coments