Lots of changes

To sprites too