Added verification, other stuff.