Multiple chanegs and fixes

- Added network mode to advanced scenario
- should fix #34,  #1, #37 and #38