Disable verification, improve error reporting, cleanup