Ch 3.2 solved.  Also cleaning up autosave cruft.