minor heap and bitmask changes