connectors and other things work better
fixed merge issue and bugg