A trillion network changes. Not done yet, commiting for backup.
More fixes.