Update gapclose more, some changes