Extract bugfixes and clearer headings