Amir's final changes

Just thought you'd like to see Amir's last minute changes that we turned
in.