Better goal tree and hint and solution. Fixes Issue #37