checkin in a bunch of changes