Fixed formats and typos