minor changes from last revision. Can't remember exactly what I did