All   :   Various changes and bug fixes.