Updates to work with 6.1
Cleaning up messages so they all conform to Equatable and are formatted nicely. Renamed AddrMessage to AddressMessage.