Update with Connection setting, some bug fixes