expand headers; bug fixes