Again lots more work on variations and lots of fixes.