make headers better