Merged tracker files, fixed socket creation