Added more Events and Javadoc