Some manual improvements.