minor shader changes
code cleanup for states
preparing attribute and uniforms for structs in shader