More bugs fixed and more preservation added.