More work on the new preset system, and many incidental fixes along the
way...