fixed issues with verification