Various small fixes
Update network.
Merge branch 'master' into fixes_L
Merge pull request #731 from SCIInstitute/fixes_L

Milestone L ready to go