making fixes per ross request