More sprites and magic number removal