Hopefully fix live issues, integrate new header