Network manager added; a lot of small changes