Some fixes

BugFixes, trying to move more network functionality into the service