removed hardcoded names XP, fixed connect potentially not connecting at all