Some fixes and change the sprites