Fixed scoring speed and some small errors