add stuff to header and fix other stuff