short names
examples and improved headings