refactored
did with some basic find nodes in network stuff
resolved conflicts
solved some basic error in ;