-Fixed program headers, tidied up