Update

Correction of minor errors, changes style, change default setting...