minor changes; nightly checkin