fixes for spikes and fast running