Thread add peers and fix remove orders

Fixes #437
Fixes #403
Fixes #426
Text Wrapping