added fireworks and fixed some stuff
merging