several fixes, preparing structure for interventions visualization