Sprite images fix

Sprite image refactor bugfixes - many (most?) of them seem to work now.