some more fixes based on explanations on the google groups discussion.