few language tweaks