fixing header
more bundle cleanup