Updates based on patch and suggestions from ESR.
Updates based on patch and suggestions from ESR.

CaptainHayashi/sox,MageSlayer/sox,pcqpcq/sox,Distrotech/sox,CaptainHayashi/sox,pcqpcq/sox,Distrotech/sox,davel/sox,Distrotech/sox,mhartzel/sox_personal_fork,davel/sox,davel/sox,MageSlayer/sox,mhartzel/sox_personal_fork,Motiejus/sox,pcqpcq/sox,Motiejus/sox,Motiejus/sox,Motiejus/sox,CaptainHayashi/sox,jacksonh/sox,mhartzel/sox_personal_fork,pcqpcq/sox,jacksonh/sox,davel/sox,uklauer/sox,MageSlayer/sox,mhartzel/sox_personal_fork,cbagwell/sox,uklauer/sox,cbagwell/sox,uklauer/sox,CaptainHayashi/sox,Distrotech/sox,uklauer/sox,cbagwell/sox,cbagwell/sox,MageSlayer/sox,jacksonh/sox,jacksonh/sox,MageSlayer/sox