Bunch of minor and major language fixes