Bug fixes. Interim checkin so I can switch computers.