fix black cell toggle; fix cell edit handlers