included some of the changes from Mihai- but also many of my own changes that had gotten lost in translation somehow