Added Network and did a few minor cleanups.