More variations and minor fixes