updates to render correctly
cleaning up headers