fixed issue with header
fixed empty header/body issue
updated v#