once-over edit and typos