Using proper event, and fixing javadoc
Updating config