Bug fixes and final on connections.