Firing, bug fixes