More bugfixes. Attempts of p2p communication.