* Fixed comment
* Better error handling in rescale