removed brokenindicator, pulled some changes