redo sprites and more tidying
resolving merge conflict