Changed monitoring part, added a diag, changed some explanations etc...