Updated to latest CPA draft, added RadioDNS discovery, TLS, general tidy up