restore the spyies for the release
Fix the temporal view of the sorting world (plus various cleanups)