extracted common headers, fixed options header