Added missing connect and disconnects...