improvements to network plugin, closes #21