Added scaling, fixed shading