Worked more on the verifier and fixed up small bugs in other modules