New variants and some minor fixes.