Arguments and network, fixes #4 and #5