Add point and goal leaders. Fixes #2