improved collapsing behavior
fixed a typo
Merge branch 'master' into newVariantMgt