minor fixes to clean, entity, listen