fixed up headers
merge