More DNS Header stuff, code cleanup