more fix

fix logic
fix connection
another fixes