Spikes

And some fixes