Fixed infinite connecting bug. Smaller issues