Language update and some requested adjustments