no cancel button
typos
buncha fixes with @jhil
Merge branch 'release/7.0.6'