Minor fixes and labelling.