Several fixes mostly typos