Corrige more statements per line and some minor.
Major