Rescaling now done based on axes instead of data

Fixes #1