Improved score card
More stages
Tidying up