wip
better peer handling
Final (untested, undebugged, non-working) config update.