Fixed a few scaling bugs...