Add headers and minor cleanups