Sprite prepwork

And some prefab fixes