some clean up, added texture types to texture.h for future normal mapping or other effects