Some improvements / fixed typos