Language improvements

May require some further adjustments but it's quite better than now.