Many structural fixes in sprites and rendering/naming