more sprite works
Merge remote-tracking branch 'origin/Sprite' into TimBranch
face and merge