minor adjustments to v1.1