Various Refactoring. In networker changed to being partly event driven.