Re-worked names, refactored stdout handling, simplified peer_id handling
Final commit