removed isUnstable(), misc streamlining