Correct wording and solution display to fix bugs 2579 and 2588.
Fix bugs 2579, 2588.