move and tweak some goals