some fixes, better document, frenchize and so on