some fixes - works w. header only msgs now