Fixed and finished calculating score