hitodama minor unreversed header additions, cleanup