Fixed some network bugs, testing through