Modified TreeNode with clone() method to fix highlighting bug, modified CombinationDialog to improve readability