rever the connected state: some small issues