Updates since getting a sample packet capture from Mike Komer - #42