Title: Spikes and solitary waves in the free-electron laser at Columbia University