Updated headers and some housecleaning