Tweaks to firing.  Introduces a hilarious bug which I'll fix later.