Various fixes

* Fixed #121 
* Fixed localization
* Minor clean up
this morning is not my "write good french" morning at all, thanks!