Tweaks
Added score
There are no conflict, damn git