Socket Solution Bugs Fixed