stredming and header fixes