code cleanup + extra test
configurable sock
v1.6.0