fix ups
more fixes