Fixed both the scaling and bin bugs.
Can't believe we got this far without detecting this...