Begin sprite tidy up
Make sprite object usage a little clearer
Merge branch 'fix/sprite' into v5.0