Further changes to spike sorting, compatible with tetrodes now...