shuffling stuff around
fixed header bug