some fixes (socket hang problem - still to be fixed)