Fix up errors, get verify prolly working.