More verification, and a few minor fixes