Fixed scorekeepig

TODO: Lots!