fix active
update according to François and Olivier's feedbacks
fix figures + update CI