This draft addresses my only real concern, which was pointing out that using the MAC address as an identifier has issues.  Thanks.  I like the other changes, too.