Ported back BlinPhong and Diffuse
White space fix