minor changes

still need to figure out if spikes are being returned properly for the
different "get spikes" functions!!!!