Adding parsing + fixing headers