Updated Geometry and Shader. Fixed comments