All update changes

oops this is a big checkin
other changes

oops