added more attributes and uniforms