Added missing T-shape. Added heap and heap status. Minor updates