update combine to use weights; add combine norm