More L20n & small bug fix