bug fixes
Merge branch 'confirm'