translation and minor improvements