fixed some misaligned goal entities