still fixing network bugs