more tweaks - getting closer to properly reserializing spikes