Clean-up, P2P, adding to config

And other stuff