added SPICE to the list, made a few changes