I think this will merge our work... I'm not entirely sure...

mostly added to lists. Messed with the flash spell too.