fix ups
merge