Some bugs fixed.

Main scenery prepared for tomorrow's presentation at ESNE