Slight fixes in rendering. Scaling works