clean + correction bugs modal