Improvements to DemoCat.