Converted stuff to Sprites, tidied up update code as a result.