Some temp condvar work and comment changes.