added scale factor
fixed some naming issues with scale