Fixed the goals' system a bit