Fixes to the order preserver. Still buggy...