Better scores and some small changes