Some Main changes

Signed-off-by: Francis Galiegue <fgaliegue@gmail.com>
More changes in Main

Signed-off-by: Francis Galiegue <fgaliegue@gmail.com>