Fixed scale, other small changes