Merge: lib/socket: fix, update style and intro features