Cleaned up some client/server eventing