Bug fix and enhancements

Ricardo asked me to fix your widget. Ask me if you need some informations.

--
Stéphane