more language related tweaks, will need changing