small improvements to verifying logic