edit comments at the top and goalState