Minor changes. Still looking at the quoted goal types