Some manual changes