Change for a verification, and some bugs found