Comments reflowed and typos