Fixed a couple network bugs. Resolved #2.