Changed the headings a bit

Few more commits will follow ...