started fixing scaling bugs