some improvements & fix for canceling verification