Correction of some explanations, cleanup