multi lang and little fixes