cell paint fixes and testing