Sprites Fix v3

Just going to pull to dev and leave it, not in that much of a hurry.