Adding license headers and other misc cleanup
More license headers and other misc cleanup