Slight improvements... (+2 squashed commits)
Squashed commits:
[8bfbbb0] 3 nodes, this time.
[73fbdb5] Slowly getting there...