Updates to things
Merge pull request #14 from Valakor/network

Updates to things