Some fixes and translated comments to English