From now on, all code is in English!
Plus minor fixes