-Fixed wrong name on ScaleAndShift
-Made some small adjustments on figures' labels
-Minor changes