Add some verification code, which also exposed three typos