Added some stats, fixed bugs, reverted to old scoring