Improve log messages
Fix swapping (didn't happen due to always in progress) + improve logging
Generate a larger ring and take into account that a directly connected peer will get our location after a swap