Fixed all the math and scale