fixes + option to set headers