preferences, chat stuff and Event.java
merged
Merged really fixed