Fix and typos