Added averaging to weights
Changed mesh boundary to be double-sided inclusive