Bugfixes, and raw connection