o Some smallish cleanup and comment updates.