Added stability fixes.  Missing branches are removed from the branchmap.  This means that the extendedVars flag is no longer needed and it has been removed.