Add new goals. Fix old goals.