Update HEADER and fix some more things. Fix tests so they pass.