Changed some javadoc, added Event object, edited handler and listener