Fixed a bug and updated the score screen.
Fixed merge issues.