I made the part of the changes that were obvious. Thanks much. If Pavel has time to look into it, we can change it, else feel free to make the release. Ack. Pavel?