Reorganized for long run. Still errors on reconnect
Fixed (re-)opening of session