Slight modifications

Running remainder of rescaling.