fixed order of goals, removed some unnescessary things