Better translation and minor improvements