Many sprite updates

Still working through it, but figured I’d commit changes before I did
too much.