variable name fixes, socket notes