some extra headers and todos for next time