Some important remarks from Dmitry Baryshnikov
Some small changes