fixed verification issues