Add comments and fixed event list