Added some more score calculations