Fixed some connection bugs
Final bug fixed for Ver 1.6