Scale factor replaced by magnification
Improved offset handling