Bugfix and better headings