new header size, and random fixes