Add headers and minor aesthetic changes