Fix some bugs. (eg... no figure is desplayed.)
Merged test branch