Corrections to helpers and typos