refactored and enabled more server event logging