improved headers, replaced global labels with local labels