Improvments to header and add translation