More Bug fixes with network
Merge branch 'dev'