Adding network + messages to slave; fixing minors bugs to master