section headers, bug fixes