Corrections and language tweaks