making fixes